Plate cache updates and DB serialization clean up. #5162
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
labkey-nicka
approved these changes
Jan 27, 2024
| @@ -205,7 +205,7 @@ private static Plate getPlate(ExpProtocol protocol) | |||
| { | |||
| // resolve plate by the legacy deprecated plate name method | |||
| ObjectProperty prop = protocol.getObjectProperties().get(protocol.getLSID() + AbstractPlateBasedAssayProvider.PLATE_TEMPLATE_SUFFIX); | |||
| return prop != null ? PlateManager.get().getPlate(protocol.getContainer(), prop.getStringValue()) : null; | |||
| return prop != null ? PlateManager.get().getPlateByName(protocol.getContainer(), prop.getStringValue()) : null; | |||
There was a problem hiding this comment.
Just curious, did you verify these changes through the upgrade(s)?
There was a problem hiding this comment.
Yes I ran the upgrade manually, but you have to revert the protocol property to use the plate name unless you upgrade from an older version. Did you see an error on your end?
| /** | ||
| * Serializes a row in the assay.plate table. | ||
| */ | ||
| public class PlateBean extends Entity |
There was a problem hiding this comment.
This is great. Splitting these up will serve us well I believe and leave us less prone to improper serialization on either side.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Rationale
Removes support for plate name in the cache. Plate by name is
deprecatedand could eventually be removed. Instead the more recentplateIdhas been added to the cache.This PR also introduces a
PlateBeanto help with serialization to and from the database. This allows us to be a bit cleaner with thePlateinstance which is a richer, composed object so we don't have to have methods like:getPlateType&getPlateTypeObjectgetPlateSet&getPlateSetObjectWhich were needed to support DB binding plus returning the underlying object instances.